EndOfSTF594

Yann Garciarequested to merge
devel into master

End of STF 594 work. Need to merge with master

Merge request reports