merge r12896 to 8.09