Merge pull request #45 from xschildw/release-1.7

PLFM-1837