Merge "Sanitization before BatchUpdates and Transformations"