Merge "Revert "SVACE issue fix"" into tizen