Merge "Fix memory corruption by changing refs to Objects"