Merge branch '294' into '8.0'

294

See merge request !255
2 jobs for 8.0 in 1 minute and 21 seconds
latest
Status Job ID Name Coverage
  Test
passed #30790
lint
lint

00:00:16

passed #30791
lint
upload_image

00:01:21