Merge "5G Q backport" into qt-qpr1-dev