Merge "Fixed SVACE errors" into devel/master