merge r13892 to 8.09