Merge "Vts: Add missing usage to buffer" into sc-dev