[backfire] merge r25753