Contribution and partcipant payment record missing on re-registration by participant with existing Pending registration

We allow anonymous user to register twice with pay later (with allow_same_participant_emails = false) since the first registration is pending. However, on the second registration we don't create another (new) contribution record and participant_payment record. So now we have 2 pending participant records, 1 participant_payment record and one pending contribution record. When I "Update Pending Contribution" record - it updates the status of both pending participant records to "Registered". This is wrong behavior - since now I have 2 Registered participant records and only one payment (i.e. one completed contribution).

I think the fix is to make sure each participant record has a matching contribution and participant_payment record.