Merge branch 'hotfix/1.8.3' into 'develop'