A few more 8.10 changes

Backport:

• !2410 (closed)
• !2367 (closed)
• !2349 (closed)
• !2337 (closed)
• !2351 (closed)
• !2302 (closed)
• !2343 (closed)
• !2045 (closed)
• !2271 (closed)
• !2242 (closed)
• !2219 (closed)
• !2280 (closed)
• !2228 (closed)
• !2117 (closed)
• !2185 (closed)
• !2229 (closed)
• !2213 (closed)
• !2164 (closed)
• !1598 (closed)
• !1796 (closed)