merge r14058 to 8.09