merge r14568 to 8.09