Merge branch 'develop' into 'change-to-stage-server'

# Conflicts:
#   .gitlab-ci.yml
2 jobs for change-to-stage-server in 4 minutes and 14 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #1844
build

00:01:52

 
  Layout
passed #1845
layout

00:02:22