Merge branch 'noc-1582' into 'master'

#1582

See merge request !5525

(cherry picked from commit a78f3129)

b2233019 fixed
14 jobs for !5529 with cherry-pick-a78f3129 in 81 minutes and 35 seconds (queued for 9 seconds)
latest merge request