Merge branch 'Backend-refactoring' into 'master'

Backend refactoring

See merge request !12
3 jobs for master in 5 minutes and 41 seconds (queued for 1 second)