[backfire] merge r28436