Fix conflict

Merged Santiago Said requested to merge FixConflict into 11.0-stage

Merge request reports