Merge "Align saved query text" into rvc-dev