Merge "Cleanup python version properties" into main