On the '1.3.x' branch: Merge r1758362, r1910045, r1910046, r1910047 from trunk with relevant CHANGES updates.