Merge "Check that PIP is active before setting the PIP exclusion bounds" into sc-dev