SWC-579 and fix the build
Merge pull request #428 from jay-hodgson/SWC-579b

SWC-579 and fix the build