backport r57626
2 files changed