ready
Merge pull request #1293 from john-hill/SWC-1816

ready