Merge "Fix SVACE issue" into tizen