Task-number: QDS-5172 Change-Id: Ib17c38ef7b89b05daababaad1f8e2dc39d53a2bf Reviewed-by: Marco Bubke <marco.bubke@qt.io>