imported patch partial-and-patch
5 files changed