Merge "Some text polish" into rvc-dev