Merge r16867 to 8.09