End of STF 678

Yann Garciarequested to merge
STF678_Task4 into master

Closing STF 678, merge work into master branch

Merge request reports