Merge "Listenable queries in SCL"