Merge branch 'accept-deletes' into 'develop'