done
Merge pull request #1228 from john-hill/SWC-1706

done