Merge "Minor QS fixes" into rvc-dev