Merge "Waiting for the psim subscriptionInfo ready" into main