merge r13753 to 8.09