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
Merge branch feature/jorgen.lind/fix_unit_tests with refs/heads/master into refs/merge-requests/386/train