Merge branch fix/ci+setup with refs/heads/master into refs/merge-requests/13/train

1 job for !13 with fix/ci+setup into master in 2 minutes and 47 seconds (queued for 1 second)
merge train