Merge "Fix cert detection with custom PYTHON3_VERSION"