Merge "Fix memory leak." into oc-dr1-dev