Use combined preference store
2 files changed