Merge "Minor change to cross profile setting subtext." into rvc-dev