patch files added successfully

cherry-picked!
restored to original mergeconflict text