Code review for #19418