42744 (~0141857): Updates based on change review for 2.39 release.