Merge "Fix svace issues" into devel/master