Merge branch 'fix-release2' into 'master'

(GONRG-4443) fix release

See merge request !308
13 jobs for master in 3 minutes and 50 seconds (queued for 3 seconds)