merge r13739 to 8.09