Merge branch 'patch-4' into 'release-20.4'

20.4.1

See merge request !4704
9 jobs for latest-20.4 in 38 minutes and 4 seconds (queued for 13 seconds)
Name Stage Failure
failed
build_oel7 Build
No job log
failed
build_freebsd Build
No job log
failed
build_ubuntu16 Build
No job log
failed
build_debian10 Build
No job log
failed
build_debian9 Build
No job log