Merge pull request #24588 from deepeshgarg007/subscription_fix_new

fix: Multiple fixes in subscription