Merge "Fix default implementation and VTS error" into main