Added preference data
Add missing major type defs
auto-merge staging into master