Merge branch 'hotfix/Unzipper'
Merge branch 'master' into develop
Merge branch 'develop' into feature/standalone_plugins