Merge "Add hook for intercepting query" into rvc-dev