Issue #2295 was fixed.
Merge remote-tracking branch 'origin/1.7.2' into 1.7.2