merge r14882 to 8.09 (#5703)