GPII-549: Merge with prefsEditors:master.