Merge "Wait until PIP has the correct bounds before continuing" into udc-qpr-dev