Merge "Add delete key support." into nyc-dev