Merge "PIP: Fix regressions" into nyc-dev