OZP-64 Restored preferences services
Merge branch 'master' into feature/ozp-73-persistence-api