Merge "set VID to use internally UTC timezone"