8.10 release rollup

Backports for

• !6185 (closed)
• !6201 (closed)
• !6133 (closed)
• !6238 (closed)
• !6228 (merged)
• !4497 (closed)
• !6300 (closed)