merged changes for SWC-750
Merge pull request #482 from john-hill/SWC-750-a

merged changes for SWC-750