merge r13788 to 8.09