merge r14061 to 8.09