Summary

In branch abci++ there is a PR (#6546) for FinalizeBlock which was closed before merging to the branch.
As the abci++ has now been rebased to abci++_rebased, we should also rebase #6546 before opening a new PR to try to merge it to the rebased branch (see #7658)

Dependencies

None

For Admin Use

• Not duplicate issue
• Appropriate labels applied
• Appropriate contributors tagged
• Contributor assigned/self-assigned