Merge pull request #1222 from john-hill/SWC-1746

done
kinda
seems to work
pre-test
with tests
pom.xml
minor
code review changes
minor
Merge pull request #1227 from john-hill/SWC-1702

Swc 1702