[FIX] bug in merge order

Merged Leandro Martinek requested to merge 7.0-fix_merge_orders into 7.0-stage

Merge request reports