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

20.4.1

See merge request noc/noc!4704
9 jobs for 20.4.1 in 13 minutes and 49 seconds (queued for 1 second)
latest