Backports: !9837 (closed) !9838 (closed) !9849 (closed) !9854 (closed) !9858 (closed) !9862 (closed) !9873 (closed)