[backfire] merge r25589