Just use model update when softDeleting.
Merge branch '4.0'