Merge "Fixing SVACE error" into devel/master