Merge "Fix Svace issue" into devel/master