Merge "Don't query unused values" into main