Merge branch feature/jorgen.lind/update_2.1_rh_build_fix with refs/heads/2.1...
Merge branch feature/jorgen.lind/update_2.1_rh_build_fix with refs/heads/2.1 into refs/merge-requests/504/train
Merge branch feature/jorgen.lind/update_2.1_rh_build_fix with refs/heads/2.1 into refs/merge-requests/504/train