Merge 21.0.105 into 21.3

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

This merge request merges nearly all the changes that were made to the 21.0 branch between the release release/21.0.105 and the previous release release/21.0.104.

Below is the full list of merge requests that were included between these two tags:

NB !28231 (merged) was specifically not merged into 21.3 as those changes were for 21.0 only.

Link to the full diff between release/21.0.105 and release/21.0.104 is available at

Merge request reports