To be extended as neeeded. Pick-to: 6.5 Change-Id: I57d2f55f67de073fe3e4916b7ba655342cf661dc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>