Merge branch feature/jorgen.lind/multi_component with refs/heads/master into...

Merge branch feature/jorgen.lind/multi_component with refs/heads/master into refs/merge-requests/477/train
3 jobs for !477 with feature/jorgen.lind/multi_component into master in 23 minutes and 47 seconds (queued for 2 seconds)
merge train