Merge "Fixes in DataGrooming"