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

All 3 tests pass in 0s

1 files - 15 2 suites - 80 0s ⏱️ - 11m 12s
3 tests - 271 3 ✅ - 260 0 💤 - 6 0 ❌ - 5
3 runs - 296 3 ✅ - 284 0 💤 - 7 0 ❌ - 5

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