Merge "PIP: Handle configuration changes" into nyc-dev