PLFM-1226
SWC-1226
Merge pull request #857 from brucehoff/SWC-1226

PLFM-1226