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