Merge "Bug 2864: Fixed (de)serialization of leafrefs"