Merge branch 'OCF48-refactor-code-from-production-server-branch' into 'staging'

Code refactoring

See merge request !37
9 jobs for staging
in 10 minutes and 28 seconds, using 0 compute credits, and was queued for 4 seconds