merge r13760 to 8.09