Merge "Fix rare edge-cases pip crashes" into tm-qpr-dev