Merge "Fix some "leaks"" into oc-dev