Merge "Fix zombie process issue caused by trace trigger" into main