Feature/updates ff pm

Merged Martin Schneider requested to merge feature/updates-ff-pm into master

Merge request reports