Merge "Support query encapsulation information." into rvc-dev