Merge pull request #2026 from valentinewallace/2023-02-dedup-pending-forwardable-evs