merge r13075-13076 to 8.09