Branch merge stability fixes

Check out our release notes to learn more.