ENG-5027 Fix undo token handling and IPC.