[backfire] merge r26930