Merge pull request #1271 from brucehoff/PLFM-2763

PLFM-2763
Merge branch 'release-42' into develop