start
check
refactor
merge
fixed a test
working tests
builds
Merge pull request #1231 from john-hill/SWC-1696-d

Swc 1696 d