[backfire] merge r26642