Merge in negotiate support