addressing review comments
Merge pull request #1489 from marcel-blonk/PLFM-2940

addressing review comments