Merge pull request #535 from jay-hodgson/release-9

SWC-799: rework header