Merge "Fix memory leak" into tizen