merged changes for stacked subscriptions