merge r13890 to 8.09