SWC-774
Merge pull request #499 from jay-hodgson/release-8

SWC-774: merge from release-7