These are mostly comments in the code. A few error messages were fixed and are of low enough importance not to deserve a backport. Some regtests were also fixed.
We rename all the VTC files to avoid name collisions when importing/backporting.