Merge "Refactoring of 'DataGenerator' classes for identity V2 and V3"