Merge "Make pairwise() only subscribe to upstream once" into tm-qpr-dev