merge r13914 to 8.09