Merging daemon RPC availability changes