Merge "Fix the vts error" into qt-dev