Merge branch feature/morten.ofstad/remapping with refs/heads/master into...
Merge branch feature/morten.ofstad/remapping with refs/heads/master into refs/merge-requests/545/train
Merge branch feature/morten.ofstad/remapping with refs/heads/master into refs/merge-requests/545/train