fixed
mereged to develop
Merge pull request #1238 from john-hill/SWC-1766-dev

Swc 1766 dev