v3007.12
Merge branch '3006.x' into merge/3006.x/3007.x-26-02-05
Merge branch '3006.x' into merge/3006.x/3007.x-25-12-17
Fix broken backport 64229 form master to 3006.x
Pyupgrade and drop six
Merge branch '3006.x' into merge/3006.x/3007.x-1-9-25