Merge "Add drop for sensitive and incompatible fields"