merge vg-develop