Preference Manager latest
Merge pull request #1395 from leoj3n/preference-manager-latest

Preference Manager latest