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

Merge branch feature/jorgen.lind/fix_unit_tests with refs/heads/master into refs/merge-requests/386/train
3 jobs for !386 with feature/jorgen.lind/fix_unit_tests into master in 24 minutes and 38 seconds
merge train