Merge branch feature/jorgen.lind/fixvs17 with refs/heads/master into refs/merge-requests/163/train

3 jobs for !163 with feature/jorgen.lind/fixvs17 into master in 4 minutes and 36 seconds (queued for 1 second)
merge train