Merge branch 'backport-test-FindPkgConfig-isolate-env'