More backporting updates