DL2 umami
See merge request !42873 (merged)
DL2 umami See merge request !42873 (cherry picked from commit c5e0e712) 731fbc6f DL2 adaptions to be able to run umami