sync mm-stable with mm-hotfixes-stable to pick up depended-upon upstream changes