Pick-to: 6.9 6.9.1 6.8 Change-Id: I5a4011ce5f23517d4dd7c9f64738e7be97b4c73d Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>