Merge 21.3.23 into 21.9

Merged John Derek Chapman requested to merge jchapman/athena:Merge21.3.23into21.9 into 21.9

This merge request merges all the changes that were made in the 21.3 branch between the release release/21.3.22 and the previous release release/21.3.23.

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

Link to the full diff between release/21.3.23 and release/21.3.22 is available at

Merge request reports