Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.