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

All 56 tests pass in 6m 19s

1 files - 15 9 suites - 73 6m 19s ⏱️ - 4m 53s
56 tests - 218 56 ✅ - 207 0 💤 - 6 0 ❌ - 5
56 runs - 243 56 ✅ - 231 0 💤 - 7 0 ❌ - 5

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