Merge "Fix SVACE issue." into devel/master