Merge r63621 and r63636 from REL1_16: