Merge "Add ability to delete individual history items"