Merge "Fix null pointer in SubscriptionUtil" into qt-dev