SWC-715
Merge pull request #729 from jay-hodgson/SWC-715

SWC-715