Merge branch 'newsysprefs' into 'master'