[FIX] Better rules for Supervisors and Commercials

Merged Gabriel Davini requested to merge 8.0-complex_matrix into 8.0-stage

Merge request reports