Tomas Remes updated Sub-task WELD-2361