Merge "Fix the svace issue" into tizen