NXP-14009 handle rollback cases