Merge "Few modifications in DataChange DGs" into frankfurt