Added metadata support for subscriptions
Merge branch 'metadata' into busyconf

* metadata:
  Added metadata support for subscriptions