[backfire] merge r26484