Fixed softdelete
Merge origin/master