done
Merge pull request #1183 from john-hill/SWC-1695

develop SWC-1695