Merge "Revert "Fix memory leaks""