Backports for 8.10

Backports:

• !3829 (closed)
• !3924 (closed)
• !3856 (closed)
• !4046 (closed)
• !3902 (closed)
• !4078 (closed)
• !4106 (closed)
• !4136 (closed)
• !4231 (closed)

cc @bgamari