Tmf 674 feature

Labros Papadopoulosrequested to merge
tmf-674-feature into develop

Merge request reports