Merge "Fix notifications undo system (1/2)" into main