Merge branch '357' into '8.0'

357

See merge request !254
2 jobs for 8.0 in 1 minute and 30 seconds (queued for 1 minute and 57 seconds)
Status Job ID Name Coverage
  Test
passed #20770
lint
lint

00:00:16

passed #20771
lint
upload_image

00:01:14