Merge "Update conversation strings" into rvc-dev