Take 2.
Better
Cleanup
Merge pull request #1347 from xschildw/PLFM-2784-2

Plfm 2784 2