CM Shell: changes to user defaults.
Merging with master branch.