[OE-3856] changes to support global soft deletion