Merge "PIP: Apply the comment from the previous commit" into nyc-dev