Merge "Add new columns for embedded subscriptions."