backport: Merge bitcoin#29041 - #7190

Potential conflicts detected!

{ pull_number: 7190, conflictPrs: [ { number: 7320, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/chain.cpp', 'src/chain.h', 'src/consensus/validation.h', 'src/headerssync.cpp', 'src/headerssync.h', 'src/index/base.cpp', 'src/interfaces/node.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/node/interface_ui.cpp', 'src/node/interface_ui.h', 'src/node/interfaces.cpp', 'src/pow.cpp', 'src/pow.h', 'src/primitives/block.h', 'src/qt/bitcoin.cpp', 'src/qt/bitcoingui.cpp', 'src/qt/bitcoingui.h', 'src/qt/clientmodel.cpp', 'src/qt/clientmodel.h', 'src/qt/informationwidget.cpp', 'src/qt/informationwidget.h', 'src/qt/modaloverlay.cpp', 'src/qt/modaloverlay.h', 'src/qt/rpcconsole.cpp', 'src/qt/rpcconsole.h', 'src/qt/sendcoinsdialog.cpp', 'src/qt/sendcoinsdialog.h', 'src/rpc/mining.cpp', 'src/rpc/net.cpp', 'src/test/blockfilter_index_tests.cpp', 'src/test/coinstatsindex_tests.cpp', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/fuzz/bitdeque.cpp', 'src/test/fuzz/pow.cpp', 'src/test/fuzz/utxo_snapshot.cpp', 'src/test/headers_sync_chainwork_tests.cpp', 'src/test/miner_tests.cpp', 'src/test/pow_tests.cpp', 'src/test/skiplist_tests.cpp', 'src/test/util/mining.cpp', 'src/test/util/setup_common.cpp', 'src/test/util_tests.cpp', 'src/test/validation_block_tests.cpp', 'src/test/validation_chainstate_tests.cpp', 'src/util/bitdeque.h', 'src/validation.cpp', 'src/validation.h', 'test/functional/feature_block.py', 'test/functional/p2p_compactblocks.py', 'test/functional/p2p_dos_header_tree.py', 'test/functional/p2p_headers_sync_with_minchainwork.py', 'test/functional/p2p_invalid_messages.py', 'test/functional/p2p_unrequested_blocks.py', 'test/functional/rpc_blockchain.py', 'test/functional/rpc_net.py', 'test/functional/test_runner.py' ], conflicts: [ 'test/functional/rpc_net.py' ] }, { number: 7318, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/bitcoin-chainstate.cpp', 'src/chain.cpp', 'src/chain.h', 'src/consensus/validation.h', 'src/headerssync.cpp', 'src/headerssync.h', 'src/index/base.cpp', 'src/interfaces/node.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/node/interface_ui.cpp', 'src/node/interface_ui.h', 'src/node/interfaces.cpp', 'src/pow.cpp', 'src/pow.h', 'src/primitives/block.h', 'src/qt/bitcoin.cpp', 'src/qt/bitcoingui.cpp', 'src/qt/bitcoingui.h', 'src/qt/clientmodel.cpp', 'src/qt/clientmodel.h', 'src/qt/informationwidget.cpp', 'src/qt/informationwidget.h', 'src/qt/modaloverlay.cpp', 'src/qt/modaloverlay.h', 'src/qt/rpcconsole.cpp', 'src/qt/rpcconsole.h', 'src/qt/sendcoinsdialog.cpp', 'src/qt/sendcoinsdialog.h', 'src/rpc/mining.cpp', 'src/rpc/net.cpp', 'src/test/blockfilter_index_tests.cpp', 'src/test/coinstatsindex_tests.cpp', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/fuzz/bitdeque.cpp', 'src/test/fuzz/pow.cpp', 'src/test/fuzz/utxo_snapshot.cpp', 'src/test/headers_sync_chainwork_tests.cpp', 'src/test/miner_tests.cpp', 'src/test/pow_tests.cpp', 'src/test/skiplist_tests.cpp', 'src/test/util/mining.cpp', 'src/test/util/setup_common.cpp', 'src/test/util_tests.cpp', 'src/test/validation_block_tests.cpp', 'src/test/validation_chainstate_tests.cpp', 'src/util/bitdeque.h',