Merge "Preferences class deprecation, step 2"