Merge "VID logging adjustments"