Changes like those already applied in master in !47530 (merged) to fix ATLASRECTS-6827
FYI @pberta @mhodgkin @vcairo @gfacini @goetz @sroe