Merge "Move identity_version to class level"