Merge review of 9.47.1

Heads up, we've moved testnet start to enable faster parsing of testnet