initial commit for PLFM-1730
tests for PLFM-1730
Merge pull request #196 from brucehoff/develop

PLFM-1730