Merge "String updates" into rvc-dev