[backfire] merge r26773