More backports.