Merge "Fix segmentation fault" into tizen