Logo before subheader
Merge branch 'develop' into v2.1