Merge "Fix apostrophe in the SubscriptionManager::setOpportunistic() method" into main