Merge "Fix pip bundling" into tm-qpr-dev