Issue #2520 was fixed.
Merge remote-tracking branch 'origin/1.7.7' into 1.7.7