merge r13714 to 8.09 branch