backport #19426
2 files changed