[backfire] merge r28149