Feature/smff

Merged Simon Morlat requested to merge feature/smff into master

Merge request reports