Task-number: QTQAINFRA-7439 Pick-to: 6.10 6.8 6.5 Change-Id: I02202d1b53ab5442e04b6e5c0d7ff3119686f117 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>