Merge branch 'hotfix-header-exception' into master