Merge pull request #1261 from brucehoff/PLFM-2749

Plfm 2749
again
Merge pull request #1263 from john-hill/PLFM-2738

again
Merge branch 'release-41' into develop
Merge branch 'develop' into PLFM-2756
sent changed as well