merge r18301 to 8.09