Various header changes to support a fixed header when the time is right.
Merge branch 'master' into MNF

* master:
  Various header changes to support a fixed header when the time is right.