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

All 21 tests pass, 2 skipped in 34s

1 files - 15 9 suites - 73 34s ⏱️ - 10m 38s
23 tests - 251 21 ✅ - 242 2 💤 - 4 0 ❌ - 5
23 runs - 276 21 ✅ - 266 2 💤 - 5 0 ❌ - 5

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