Merge branch 'mm-hotfixes-stable' into mm-stable