Merge pull request #1561 from brucehoff/PLFM-3046

Plfm 3046
fixed
Merge pull request #1570 from john-hill/PLFM-3032

Plfm 3032