Merge "Remove dependency to identity v2"