merge r15076 to 8.09