Fix 7.1.x

Related to #3565490

Merge request reports

Loading