Merge 21.0.94 into 21.3 branch

John Derek Chapman requested to merge jchapman/athena:Merge21.0.94into21.3 into 21.3

This merge request merges the changes that went into the 21.0 branch between the release/21.0.93 and release/21.0.94 tags into the 21.3 branch.

MRs in, accepted since

The full diff between release/21.0.94 and release/21.0.93 is available at

Merge request reports