Merge "Clean up some methods on the Pip interface" into tm-qpr-dev