merge r16349 to 8.09