Revert "Revert "Change detect isSoftDeletable""

This reverts commit f8367fa76f4e74b1b5a25d2557da62a88166a9eb.
Revert "Change detect isSoftDeletable"

This reverts commit 99381baabb99dc6df610e2286b737643be213e14.