merge r13051 to 8.09