SWC-536
Merge pull request #284 from jay-hodgson/release-1.24

SWC-536