[#8361] more header encoding fixes
2 files changed