Merge branch 'develop' into 'master'

Develop

See merge request !9
1 job for master in 15 minutes and 56 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #5153
build_image

00:15:56