merge r13182 to 8.09