Merge branch 'prepv3.9.4' into 'master'

Prepv3.9.4

See merge request !36
1 job for v3.9.4 in 1 minute and 48 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Tag
passed tag #8621774
docker-image-build

00:01:48