Implemented fix for duplicate addresses being created in checkout
Fixes #5370