Merge Changes from Preferences branch into master, after merging new changes from master