PLFM-2982
Merge branch 'develop' into PLFM-2982
A RuntimeException is thrown, need to look at cause.
Merge pull request #1498 from xschildw/PLFM-2982

Plfm 2982