Merge "Fix up Network and Internet Slice" into qt-dev