Merge "[VID-1] Updating vid jjb"