Merge "Split "generation" into added and modified."