Merge "More SVACE fixes" into devel/master