merge r12883-12886 to 8.09