Pick-to: 6.2 6.3 Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>