Pick-to: 6.8 6.9
Change-Id: Id743e89d0858fde4678b7ba4e848d780d19771fc
Reviewed-by: Kai Köhne <kai.koehne@qt.io>