Merge "Rename local var ident to identity"