Merge "PIP: Add PIP boundary" into nyc-dev