SWC-471: fix build (merge issue)
Merge pull request #318 from jay-hodgson/develop

SWC-471: fix build (merge issue)