Merge branch 'feature-newstyles' into release-0.13