Task-number: QTIFW-3073 Change-Id: I613b658c1ef3dbac597d8018a937a7324b582e58 Reviewed-by: Katja Marttila <katja.marttila@qt.io>