Pick-to: 6.6 6.7 Change-Id: I98e62adce63df7e940d96cd50dcb243366dca216 Reviewed-by: Paul Wicking <paul.wicking@qt.io>