Merge r15730 to 8.09