Merge branch birk-update-atlasify with refs/heads/master into refs/merge-requests/490/train

50 jobs for !490 with birk-update-atlasify into master in 17 minutes and 19 seconds (queued for 4 seconds)
merge train