Merge 21.0.104 into 21.3

Merged John Derek Chapman requested to merge jchapman/athena:Merge21.0.104into21.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.104 and the previous release release/21.0.103.

Below is a full list of merge requests that were accepted between these two tags:

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

Merge request reports