Merge 21.0.93 and 21.0.94 (21.3.10 and 21.3.11) into 21.9 branch

Merged John Derek Chapman requested to merge jchapman/athena:Merge21.3.11into21.9 into 21.9

This merge request merges the changes from the 21.0 branch between release/21.0.92 and release/21.0.94 into the 21.9 branch. This is done via a merge of release/21.3.11. (Last 21.3 release to be merged into 21.9 was release/21.3.9.)

release/21.0.93 is a Tier0 release. It's FT0-violating. It includes the FT0V MRs: !20652 (merged), !20005 (merged), !20021 (merged)

release/21.0.94 is a Tier0 release. It's FT0-preserving.

Here is the full diff between

Merge request reports