Merge "Fix VD svace problem." into devel/master