Merge "Fix use-after-free" into oc-dr1-dev