Merge branch 'cleanup the legacy probe_event on failed scenario'