Merge 21.0.120 and 21.0.121 into 21.3

This merge request merges all the changes that were made to the 21.0 branch between the release release/21.0.121 and the release release/21.0.119.

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

Link to the full diff between release/21.0.121 and release/21.0.119 is available at

Merge request reports