merge r16652 to 8.09: