[backfire] backport r25454