Merge "Improve pip to split transition" into tm-qpr-dev