V3 template

Merging v3-template changes to veg