Merge "Fix memory leaks"