Add patch for system/core