[backfire] merge r26986