Merge r15286 to 8.09