Merge vinodc memory leak fixes.