Merge 21.0.113 into 21.3

Tadej Novak requested to merge tadej/athena:merge/21.0.113 into 21.3

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

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

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

Merge request reports