Needs cleanup.
Cleanup
Fix
Merge pull request #1633 from xschildw/PLFM-3135

Plfm 3135