Merge pull request #20845 from jefferyto/ci-local-feed