Trying test
fixed build
removed comments
Merge pull request #944 from john-hill/PLFM-2442

Plfm 2442