Backports:
!9798 (closed) !9778 (closed) !9745 (closed) !9731 (closed) !9472 (closed) !9734 (closed) !9661 (merged)