merge r16266, r16269 to 8.09