Merge branch feature/jorgen.lind/2.1.4 with refs/heads/2.1 into refs/merge-requests/438/train

3 jobs for !438 with feature/jorgen.lind/2.1.4 into 2.1 in 22 minutes and 58 seconds (queued for 4 seconds)
merge train