Backports to 1.2