Merge "fix: Invalid subscription plan cause NPE" into sc-dev