Fix regression in header style
Merge branch 'refatoring-header' into develop