[backfire] merge r26968