[OE-3856] changes to support soft deletion on all models