Patch for or_10622