[backfire] merge r26908