[backfire] merge r24778