[backfire] merge r24196