KFSTP-1658
Merge pull request #138 from smith750/KFSTP-1658

KFSTP-1658