merge r14115 to 8.09