ready to test
done
Merge pull request #1246 from john-hill/SWC-1786

ready to test