Part of #19336
Part of #19336