merge r15235 to 8.09