more backports