merge r13258 to 8.09