Merge "Fix Svace Issues" into tizen