merge r14255 to 8.09