Merge knxprod/vd files

Follow