Merge branch its7239 with refs/heads/master into refs/merge-requests/477/train

3 jobs for !477 with its7239 into master in 44 minutes and 20 seconds (queued for 1 second)
merge train