Merge branch 'hotfix/1.6.3'
Fix syntax error
Merge branch 'hotfix/1.6.3-fix-error' into develop