Merge "Add connectivity diagnostics on test failure" into main