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