merge r13813 to 8.09