Issue #2411 was fixed.
Merge remote-tracking branch 'origin/1.7.5' into 1.7.5