[python3] Merge master and cleanup