Update to match python v20
Close DEV-44 #resolved #fixed