Merge "Fix svace issue for dli-extra" into devel/master