[backfire] merge r25044