Merge21.0.101 into 21.3

John Derek Chapman requested to merge jchapman/athena:Merge21.0.101_21.3 into 21.3

This commit merges nearly all the changes that were made to the 21.0 branch between the release release/21.0.101 and the previous release release/21.0.100.

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

Link to the full diff between release/21.0.101 and release/21.0.100 is available at

Merge request reports