[backfire] merge b44 spam fix from r22110