[master] Use persistent undo