merge r16434 to 8.09