Merge branch 'distributed-fmm-global' into distributed-fmm-global-ci