Merge "Added flag and tests for SubscriptionPlan changes" into main