Merge pull request #1435 from brucehoff/PLFM-2903-off51

PLFM-2903
Merge pull request #1438 from brucehoff/PLFM-2903-off51

Plfm 2903 off51
Merge branch 'release-51' into develop