Merge branch 'master' into 'dev'

fix See merge request !2
Status Job ID Name Coverage
  Pre Deploy
passed #28327
docker-image-builder
build_docker_image

00:03