Merge branch 'feature-dev'

# Conflicts:
#	.gitlab-ci.yml
#	scripts/development
1 job for master in 14 minutes and 23 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #57045
docker
build-container

00:14:23