Issue #1689 fix was reverted.
Merge remote-tracking branch 'origin/1.7.4' into 1.7.4