Merge branch 'mm-hotfixes-stable' into j