merge r13729 to 8.09