Merge "Unbundled chooser -> teamfood" into tm-qpr-dev