Pick-to: 6.4 6.2 Change-Id: I5818b94e0c3cc706ca87935b7292714c1313a641 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>