Fix none rate

Merged Santiago Said requested to merge FixNoneRate into 8.0-stage

Merge request reports