Merge "Refactor some patching logic"