Merging 17824:17845 from trunk to blocking branch.