Fix content-type header
Merge branch 'hotfix/header-charset' into stage