merge r13720 to 8.09