Pick-to: 6.7 Change-Id: Ia24b2b9fb9f3b070f8eccaf74a09787b324ab01e Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>