merge r13751 to 8.09