SWC-1744
Merge pull request #1219 from brucehoff/SWC-1744

SWC-1744