Merge "Adding block kind to protocol for future streaming of a tree." into rvc-dev