Merge "Add a new column: subscription_type to siminfo table."