Merge "Update VBRG, vBNG compatibility w/ prev templates"