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

All 8 tests pass, 1 skipped in 15s

1 files - 15 3 suites - 79 15s ⏱️ - 10m 57s
9 tests - 265 8 ✅ - 255 1 💤 - 5 0 ❌ - 5
9 runs - 290 8 ✅ - 279 1 💤 - 6 0 ❌ - 5

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