[Feature] - Data Prepare after Cleaner

Please merge into the master line