Fixes #10607 - match bonds based on identifier only
(cherry picked from commit 7be20b248502eb8682008e1c6b03fef71da4f73d)
Fixes #10607 - match bonds based on identifier only
(cherry picked from commit 7be20b248502eb8682008e1c6b03fef71da4f73d)