[backfire] merge r24219