Merge "Fix callback drop"