Delete flag reset position change
Merge branch 'hotfix/delete-fix2'