Merge change I7b9328c7 into eclair

* changes:
  Fix issue #2300232: Bugs in resolving conflicting pointers