Merge branch '355' into '8.0'

355

See merge request !252
2 jobs for 8.0 in 1 minute and 15 seconds
Status Job ID Name Coverage
  Test
passed #20445
lint
lint

00:00:15

passed #20446
lint
upload_image

00:01:15