Merge branch its7080 with refs/heads/master into refs/merge-requests/467/train

3 jobs for !467 with its7080 into master in 43 minutes and 26 seconds (queued for 1 second)
merge train