New features, not News features
Merge branch 'chiba.1' into chiba.2