Possible fix for ATLASRECTS-6948

Dan Guestrequested to merge
dguest/athena:fix-for-ATLASRECTS-6948 into 22.0

This might fix the bug in ATLASRECTS-6948. I'm replacing !56181 (closed) with this one so that the fix goes through the frozen tier0 tests.

Closes ATLASRECTS-6948

Merge request reports