Merge "Fix VD prevent issues" into devel/master