pull from develop and fix test
Merge pull request #1296 from jay-hodgson/SWC-1420

fix test (after pulling from upstream develop)