- Fixed issues with autoload
Merge branch 'hotfix/fix-autoload-issue'