Merge "Always mark reference referents in transaction mode."