Added HubDescriptor to NullMethodDescriptor

#2860
Merge branch 'release' into dev