Merge "[Settings] Fix missing part for refactor" into tm-dev