[TO_STAGE] improve clear-pending-ops to handle new failures as shown in prod