Merge "Generate up-to-date .vts files"