Merge r16378 to 8.09