Merge more-commented version of rpc_server crash fix