Issue #1865 was fixed.
Merge remote-tracking branch 'origin/hotfix-1.6.2' into hotfix-1.6.2