Merge "Preparing to switch away from the deprecated test runner" into main