SWC-774
Merge pull request #500 from jay-hodgson/develop

SWC-774: merge from release-7 (change also merged into release-8)