chore: cherry picked #969 and #976 to release/0.10 (#977) #1387

All 1 tests pass in 2s

1 files - 15 2 suites - 80 2s ⏱️ - 11m 10s
1 tests - 273 1 ✅ - 262 0 💤 - 6 0 ❌ - 5
1 runs - 298 1 ✅ - 286 0 💤 - 7 0 ❌ - 5

Results for commit d412365. ± Comparison against earlier commit eebbf38.