Merge branch 'fix/useless-header' into 'develop'