Sync with python3 branch on main repo