Merge branch addProtection with refs/heads/master into refs/merge-requests/457/train

46 jobs for !457 with addProtection into master in 16 minutes and 55 seconds (queued for 3 seconds)
merge train