Merge "Workaround an interpreter behavior to fix leak" into oc-dev