Issue #1904 was fixed.
Merge remote-tracking branch 'origin/hotfix-1.6.3' into hotfix-1.6.3