Backported from v7
Fixed issue with content location setting in header