Merge pull request #1369 from john-hill/PLFM-2843-build

Plfm 2843 build
fixed
Merge pull request #1372 from john-hill/debug-log

Debug log