Merge tag 'header-fix' into develop

css
Merge branch 'master' into develop