Merge branch 'master' into distributed-fmm-global