SWC-1704 only
Merge pull request #1184 from john-hill/SWC-1685

SWC-1704 only