Merge branch 'hotfix/1.0.3' into develop