Merge #9972: Fix extended rpc tests broken by #9768