Merge branch feature/jorgen.lind/exception_alignment with refs/heads/master...

Merge branch feature/jorgen.lind/exception_alignment with refs/heads/master into refs/merge-requests/408/train
3 jobs for !408 with feature/jorgen.lind/exception_alignment into master in 20 minutes and 44 seconds (queued for 3 seconds)
merge train