check
Merge pull request #1344 from john-hill/SWC-1941

SWC-1941 and SWC-1940