Merge "Add annotations to VTS tests" into main