Merge 21.0.114 into 21.3

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

This merge request merges all the changes that were made to the 21.0 branch between the release release/21.0.114 and the previous release release/21.0.113.

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

Link to the full diff between release/21.0.114 and release/21.0.113 is available at

Merge request reports