Merge "Fixed Svace Issue" into devel/master