Merge branch feature/jorgen.lind/2.2.1_update with refs/heads/2.2 into...

Merge branch feature/jorgen.lind/2.2.1_update with refs/heads/2.2 into refs/merge-requests/550/train