Merge branch 'noc-1644' into 'master'

noc/noc#1644

See merge request noc/noc!5643
6 jobs for master in 63 minutes and 11 seconds (queued for 6 seconds)