merge r14361 to 8.09