Merge "Separate RevDel logic from UI"