Merge pull request #1584 from marcel-blonk/PLFM-3075

Plfm 3075