Added offerings to mail_subscription feature
Merge into master