January improvements

Merged Santiago Said requested to merge JanuaryImprovements into 8.0-stage

Merge request reports