New preferences must be synchronizable
Merge remote-tracking branch 'origin/master'