Jozef Hartinger updated Sub-task WELD-1745