Fix/21

Gualterrequested to merge
fix/21 into develop

Need a description on what this fix intends to do, or to what issue is related @yova

Edited by Johannes Winter

Merge request reports