Fixed issue #2405
Merge remote-tracking branch 'origin/1.7.1' into 1.7.1