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

All 48 tests pass in 37s

1 files - 15 9 suites - 73 37s ⏱️ - 10m 35s
48 tests - 226 48 ✅ - 215 0 💤 - 6 0 ❌ - 5
48 runs - 251 48 ✅ - 239 0 💤 - 7 0 ❌ - 5

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