[OE-3987] soft deletion changes