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