Merge branch 'hotfix/3.0.3'