SWC-609
Merge pull request #341 from jay-hodgson/SWC-609

SWC-609