Merge branch 'hotfix/fix-autoload-issue' into develop
Merge branch 'release/1.0.4'