#22356 additions