Merge "Fix unnecessary string copy" into rvc-dev