merge r12838 to 8.09