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

Merge branch feature/jorgen.lind/msvc_build_fix with refs/heads/master into refs/merge-requests/555/train
3 jobs for !555 with feature/jorgen.lind/msvc_build_fix into master in 22 minutes and 30 seconds
merge train