Backports for %9.2.1
Backports:
- !6322 (closed)
- !6345 (closed)
- !6328 (closed)
- !5936 (closed)
- Fix for #19950 (closed)
- Reverts backport of !6066 (closed)
- Fix for #19606 (closed), #19607 (closed) to ease backporting
- !6334 (closed)
- !6349 (closed)
Backports: