backpropagate hotfixes / fix devnet <=> testnet merge conflict #965

Closed sam0x17 closed 1 week ago