Merge branch 'cherry-pick-f468420a' into 'release-20.2'

Merge branch 'noc-20.2.1' into 'master'

See merge request noc/noc!3915
1 job for 20.2.1 in 1 minute and 4 seconds (queued for 25 minutes and 6 seconds)
latest