SWC-1353
Merge pull request #947 from jay-hodgson/release-40

SWC-1353