Merge branch 'feature/anyplugin' into develop
Merge branch 'develop' into feature/daemon