Fixed issue #2499
Merge remote-tracking branch 'origin/1.7.4' into 1.7.4