Merge branch 'hotfix/subscription_prorate'
metadata added as optional parameter to subscribe call
Merge branch 'hotfix/subscribe_metadata' into develop