Merge "Limit the references IdentityCodec retains"