* merge r89759 from REL1_17 into trunk