PLFM-2722
Merge pull request #1225 from marcel-blonk/PLFM-2713

Plfm 2713
Merge branch 'release-40' into develop
Merge pull request #1227 from brucehoff/develop

Develop