Merge "Refactor identity"