merge r12935 to 8.09, too