Merge branch 'master' into develop
supervisor does not need starting, and it caused errors
Merge branch 'develop'