from code review
Merge pull request #1214 from john-hill/PLFM-2390-c

from code review