[backfire] merge r26382