fix SoftDelete, TimeDelete
Merge branch 'develop'