Merge "Disable deprecated /query API by default"