SWC-1715
Merge pull request #1205 from john-hill/SWC-1715-r

SWC-1715