Merge "Destroy both CE and DE data when corrupted." into nyc-dev