Merge "Generalize canPackageQuery error message" into tm-dev