Feat

Merged Santiago Said requested to merge feat into 8.0

Merge request reports