PLFM-2722
Merge branch 'release-40' into develop
Merge pull request #1229 from brucehoff/develop

Develop