merge r16159 to 8.09