Applied patch for NB#57631