[backfire] merge r26620§