Merge "Add tags for undo edits"