Merge branch feature/jorgen.lind/xmsprops with refs/heads/1.0 into refs/merge-requests/187/train

3 jobs for !187 with feature/jorgen.lind/xmsprops into 1.0 in 5 minutes and 58 seconds (queued for 1 second)
merge train