Merge pull request #748 from brucehoff/PLFM-2117

Plfm 2117
Merge pull request #749 from brucehoff/PLFM-2117

Plfm 2117
PLFM-2117