Merge pull request #1261 from brucehoff/PLFM-2749

Plfm 2749
Merge branch 'release-41' into develop