[TIDOC-1490] Fix headers