Sweep failed changes from master
All this was already reviewed in !32627 (merged) and !32693 (merged). They came from 21.2 originally, but were sent to master first.
The original sweeps from master failed because the commits need to be applied sequentially. This didn't happen because the first sweep failed to build in AthDerivation.