merge r14111 to 8.09