More rpcclient merge issues: