Use cc-prefs 0.3.6
Merge branch 'hotfix/0.3.4'