merge r13804 to 8.09