Get upstream 3.12 branch

And hope pull goes in the right way.