merge branch Ms318 delete/edit into master