check
changed all to false
Merge pull request #1356 from john-hill/SWC-1701

Swc 1701