merge r13946 to 8.09