merge r13817 to 8.09