Update to 1.6.3
Merge branch 'hotfix/1.6.3'