Pick-to: 6.7 Change-Id: Ibdb5d7d23d43b442811e4a47096b1038fcff3b27 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>