[backfire] merge r25027 and r25028