Merge "VPP version update"