Merge r15272 to 8.09