[DF-31] Undo/Redo