Merge "[Settings] Code refactor" into rvc-dev