Merge #9842: Fix RPC failure testing (continuation of #9707)