Merge branch '1468-restrict-image-size' into 'master'

Fix first issues related to image size

See merge request !1018
1 job for master in 10 minutes and 43 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #2911
test

00:10:43