Fixed kanas for subprefs
auto-merge staging into master