Merge branch '354' into '8.0'

354

See merge request !251
4 jobs for 8.0 in 1 minute and 33 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #20434
lint
lint

00:00:18

passed #20435
lint
upload_image

00:01:14

 
  External
canceled auto_openacademy80 autodeploy

canceled auto_openacademy80 autodeploy