merge r16846 to 8.09