Fix problem with deployment
Merge branch 'dev' into feature/no_graph