Merge "Fix memory leak"