[backfire] merge r25713