Change-Id: Ia78b3b16b89ab3f80d990b6e338b4a0f294ab1ed Pick-to: 6.8 6.9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>