Merge pull request #972 from jay-hodgson/release-42

merge fix for SWC-1386 to release-42