Merge "Avoid SE VTS crash" into main