Merge r15903 to 8.09