Bug 3601260: Reverting [8aca9a8e96] fixes it.
merge core-8-5-branch
Use twoPtrValue.ptr1 in stead of otherValuePtr everywhere. This is exactly the same field, but it allows twoPtrValue.ptr2 to be used for other purposes.
Fix bug #3601260 and #3602706 by reverting [8aca9a8e96]. This gives time to investigate the issue without too many people being hindered by that.
merge core-8-5-branch
merge-mark