Merge "Fix broken user removal"