9.6 backports batch

• !9811 (merged)
• !9844 (merged)
• !9942 (closed)
• !9932 (closed)
• !9929 (closed)
• !9919 (closed)
• !9828 (closed)
• !9863 (closed)
• !9852 (closed)
• !9824 (closed)