touch up on undo/redo
Merge branch 'Logic'