Pick-to: 6.3 6.2 Change-Id: Ied805f6349eaaaa2bdff82712a5b24ca8817e02f Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>