new style preferences for all lengths
Merge branch 'master' into tags-master