Merge branch 'hotfix/test' into develop
small changes to header