Add delete and rename
Merge branch 'master' into ST3