Merge branch 'patch-6' into 'release-20.2'

20.2.3

See merge request noc/noc!4706
1 job for 20.2.3 in 24 minutes and 42 seconds (queued for 2 seconds)
latest