Merge branch '349' into '8.0'

349

See merge request !246
2 jobs for 8.0 in 1 minute and 14 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #19871
lint
lint

00:00:14

passed #19872
lint
upload_image

00:01:14