[backfire] merge r25543