Merge 21.0.100 into 21.3 branch

John Derek Chapman requested to merge jchapman/athena:Merge21.0.100into21.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.100 and the previous release release/21.0.99.

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

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

Edited by John Derek Chapman

Merge request reports