Merge "Repointed subscription ids to subscription info"