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