Manual cherrypick of MR 46724 (!47035) · Merge requests · atlas / athena

Peter Berta requested to merge pberta/athena:21.0-pberta-manual-cherrypick-MR46724 into 21.0 Oct 08, 2021

This MR is a manual cherry-pick of the changes in !46724 (merged) to fix ATEAM-780. But it seems the two branches (master and 21.0) diverged quite a lot and there were conflicts. I tried to resolve them but there are much more changes in this MR as in the original MR !46724 (merged). @ssnyder , can you please take a loo whether this MR is ok?

Manual cherrypick of MR 46724

Merge request reports