Merge "Added query instrumentation when verbose logging."