merge r16765 to 8.09