Bug fixing

Elian Krajarequested to merge
stf606-final into master

Merge request reports