Fixes #4032 - Use object.id for comparisons
(cherry picked from commit 409ce13e71b5a23178e109b0fb240fc2e2c6ff94)
Fixes #4032 - Use object.id for comparisons
(cherry picked from commit 409ce13e71b5a23178e109b0fb240fc2e2c6ff94)