merge r13955 to 8.09