merge r16112 to 8.09