WIP: Fix conflicting ir rules

Closed Santiago Said requested to merge FixConflictingIrRules into 8.0-stage

Merge request reports