This implements the same protection as in atlas/athena!58187 (merged)
Tested in 21.2.100
@mfauccig
changed the description
mentioned in commit d67fd76e
merged