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

oi
SWC-799: fix header in all cases