merge r15893 to 8.09