Add diff back to cherry-pick