Merge branch 'dv-release-20.4-patch-83044' into 'release-20.4'

20.4.2

See merge request !4749
10 jobs for stable in 50 minutes and 15 seconds (queued for 2 seconds)
Name Stage Failure
failed
build_oel7 Build
No job log
failed
build_freebsd Build
No job log