re #825 - Banner is now optional
Merge branch 'feature/825-banner' into staging