Merge "Revert "Fix svace issues"" into tizen