Merge "Fix SVACE issues" into devel/master