More backportings