v3007.10
Merge pull request #68277 from bluesliverx/3007.x
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 forward 3006.x into 3007.x