Merge 21.0.107 into 21.3

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

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

Link to the full diff between release/21.0.107 and release/21.0.106 is available at

Merge request reports