remove duplicate patches, update #2678, update #2679