Merge branch 'v4.x-master' into 'v5.x-master'

441: Fix issues related to deployment of upcoming v4-release (OPENED)

See merge request !42
1 job for v5.x-master in 38 seconds (queued for 2 seconds)