Fixed the delete problem.
Merge branch 'test' into dev