KFSTP-1518
Merge pull request #122 from smith750/KFSTP-1518

KFSTP-1518