Merge "Fix for 4 Svace issues." into tizen