Merge branch '294' into '8.0'

294

See merge request !255
2 jobs for 9.0 in 1 minute and 18 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #30792
lint
lint

00:00:17

passed #30793
lint
upload_image

00:01:18