[backfire] merge r28160