Merge "Fix pip update transaction out of order" into tm-qpr-dev