Revert "Merge branch 'ATLASRECTS-6350' into 'master'"
This reverts merge request !43630 (merged)
@christos already found one issue (see !43761 (merged)) so I'd prefer to revert until we have confirmation that everything else is okay.
Edited by Edward Moyse