Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev