Merge "[Settings] Refactor for performance" into rvc-dev