8.0 fix import

Merged Santiago Said requested to merge 8.0-FixImport into 8.0-stage

Merge request reports