Merge pull request #498 from jay-hodgson/release-7

SWC-774