Fix mode

Merged Santiago Said requested to merge fixMode into 7.0-stage

Merge request reports