Merge branch birk-transition-to-puma with refs/heads/master into refs/merge-requests/548/train

49 jobs for !548 with birk-transition-to-puma into master in 13 minutes and 9 seconds (queued for 3 seconds)
merge train