Merge "fmem: interact properly with DMM" into msm-3.0