Merge "Adding status and end date to SubscriptionPlan" into main