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

done