Patch for #22106