SWC-1088
Merge pull request #738 from jay-hodgson/release-24

SWC-1088