Chore: Merge master -> develop

[kantai]

This merges the updates (hotfixes) in master back to develop

[codecov]

Codecov Report

Merging #3627 (e0de91f) into develop (441490e) will decrease coverage by 2.54%.
The diff coverage is 10.45%.

@@             Coverage Diff             @@
##           develop    #3627      +/-   ##
===========================================
- Coverage    28.68%   26.15%   -2.54%     
===========================================
  Files          298      297       -1     
  Lines       276115   276040      -75     
===========================================
- Hits         79191    72185    -7006     
- Misses      196924   203855    +6931     

Impacted Files	Coverage Δ
src/chainstate/stacks/tests/block_construction.rs	0.00% <0.00%> (ø)
src/main.rs	0.00% <0.00%> (ø)
src/net/relay.rs	18.94% <0.00%> (-3.96%)	⬇️
testnet/stacks-node/src/tests/mempool.rs	0.00% <0.00%> (ø)
testnet/stacks-node/src/tests/mod.rs	34.97% <0.00%> (-20.37%)	⬇️
src/burnchains/bitcoin/spv.rs	36.43% <13.63%> (-0.46%)	⬇️
testnet/stacks-node/src/tests/integrations.rs	40.03% <21.87%> (+40.03%)	⬆️
src/chainstate/stacks/db/blocks.rs	29.39% <66.66%> (-3.27%)	⬇️
testnet/stacks-node/src/neon_node.rs	77.45% <66.66%> (-5.89%)	⬇️
testnet/stacks-node/src/config.rs	46.77% <85.71%> (-1.18%)	⬇️
... and 7 more

... and 120 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more