PLFM-2722
Merge pull request #1226 from brucehoff/release-40

PLFM-2722