addressing review comments
Merge pull request #1416 from marcel-blonk/PLFM-2831a

addressing review comments