Merge release/21.0.93 into 21.3

This merge request merges the changes that went into the 21.0 branch between the release/21.0.92 and release/21.0.93 tags into the 21.3 branch.

release/21.0.93 contains the following frozen-tier0-violating merge requests:

MRs in, accepted since

The full diff between release/21.0.93 and release/21.0.92 is available at

Replaces !20965 (closed).

Merge request reports