issue #2636: fix was incorrect, check for equality, not identity
Merge remote-tracking branch 'upstream/release' into release