Feature/rpc locks