Merge r15753 to 8.09