merge r13826 to 8.09