Merge branch 'patch-5' into 'release-20.3'

20.3.1

See merge request noc/noc!4705
1 job for 20.3.1 in 24 minutes and 45 seconds (queued for 2 seconds)
latest