Merge "SVACE issue resolved" into devel/master