Merge "Fix a Null retval in SM#getSubscriptionsInGroup" into main