Re: Patch for -stable, 6.3.x