Code review changes on #19480