Merge "C2 VTS: Fix typo in picking up EOS param" into main