Merge branch 'develop' into 'master'

develop to master

See merge request !2
2 jobs for master in 4 minutes and 14 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #4696
build_image

00:04:14

failed #4686
build_image

00:03:11