cherry-pick new data generator
cherry-pick new data generator