Merge "Fix SVACE Issue" into devel/master