merge r15941 to 8.09