Merge "VTS: Free allocated buffers" into sc-dev