Merge pull request #1374 from marcel-blonk/PLFM-2839

address code review comments