Issue #1909 was fixed.
Merge branch 'hotfix-1.6.3' into develop