Merge branch birk-restructure-ci with refs/heads/master into refs/merge-requests/503/train

50 jobs for !503 with birk-restructure-ci into master in 29 minutes and 42 seconds (queued for 3 seconds)
merge train