Backport 3123

Backport #3123 document fix for 1.7.1