Merge "Fix deleter type mismatch"