PLFM-1799
Merge pull request #41 from xschildw/PLFM-1799

PLFM-1799
Merge pull request #42 from xschildw/PLFM-1832

Plfm 1832
Fix NPE
Merge pull request #43 from xschildw/release-1.7

Fix NPE