[backfire] merge r28180