merge r13912 to 8.09