Merge pull request #1367 from john-hill/PLFM-2843-d

Plfm 2843 d
too short
merge
Merge pull request #1370 from john-hill/PLFM-2843-build

Plfm 2843 build