Simplify and correct subscription.

Properly request newly subscribed metadata, doc update.
Always reply empty (default) subscription.
Merge remote-tracking branch 'upstream/master'