Merge "Made user preferences load from the master by default"