Merge branch feature/update_gitlab with refs/heads/master into refs/merge-requests/566/train

3 jobs for !566 with feature/update_gitlab into master in 29 minutes and 26 seconds (queued for 2 seconds)
merge train