git Merge branch 'query-logging'
Merge branch 'valuequoter-comparison'