More backports to 9.6

Backports:

• !10052 (closed)
• !10050 (closed)
• !10045 (closed)
• !10044 (closed)
• !10037 (closed)
• !10029 (closed)
• !10017 (closed)
• !10016 (closed)
• !9969 (closed)
• !9773 (closed)