Add banner handler
Merge branch 'feature-banner' into develop