Merge "Fixed memory leak" into tizen