merge r13031 to 8.09