Fix issue #2402
Merge remote-tracking branch 'origin/1.7.2' into 1.7.2