merge r13184 to 8.09