[Proposal] Better handling of patches