Backport for #19522