merge r12847 to 8.09