Merge pull request #1244 from brucehoff/develop

Develop
PLFM-2742
PLFM-2742
Merge pull request #1246 from brucehoff/PLFM-2742

Plfm 2742
changed test
changed test
Merge pull request #1247 from john-hill/PLFM-2744

Plfm 2744